fix: enforce mode restrictions even with auto-approval enabled (#5448) #5507
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Remove special handling for FileRestrictionError when auto-approval is enabled - Ensure all validation errors block tool execution consistently - Add tests to verify mode restrictions are enforced with auto-approval - Fixes issue where Architect mode could write any file type when auto-approval was on
dosubot
bot
added
size:L
|
✅ No security or compliance issues detected. Reviewed everything up to adc4d0b. Security Overview
Detected Code Changes
Reply to this PR with |
hannesrudolph
added
the
Issue/PR - Triage
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5448
This PR fixes a critical security issue where mode restrictions were being bypassed when auto-approval was enabled.
The previous fix for auto-approval introduced a regression where FileRestrictionError exceptions were ignored when auto-approval was enabled. This allowed modes with file restrictions (like Architect mode) to write to any file type.
This fix ensures that all validation errors, including FileRestrictionError, are treated consistently and always block tool execution. Auto-approval should only apply to tools that pass validation, not bypass validation entirely.
Changes:
Tests added:
Important
Enforces mode restrictions in
presentAssistantMessage.tsby blocking all validation errors, includingFileRestrictionError, even with auto-approval enabled, and adds tests to verify this behavior.presentAssistantMessage.tseven with auto-approval enabled by removing special handling forFileRestrictionError.presentAssistantMessage.auto-approve.spec.tsto verify file restriction errors block execution with and without auto-approval.FileRestrictionErrorerrors are always blocked and auto-approved tools work correctly when validation passes.This description was created by
for adc4d0b. You can customize this summary. It will automatically update as commits are pushed.